Skip to content

[8.17](backport #42565) Add latency metrics for logstash async output#42584

Closed
mergify[bot] wants to merge 7 commits into8.17from
mergify/bp/8.17/pr-42565
Closed

[8.17](backport #42565) Add latency metrics for logstash async output#42584
mergify[bot] wants to merge 7 commits into8.17from
mergify/bp/8.17/pr-42565

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 4, 2025

Same as #42537 but for Logstash

#37445 added latency metrics for the sync output but the async output is what's used by the default configuration

This is an automatic backport of pull request #42565 done by Mergify.

@strawgate @mergify
Add latency metrics for logstash async output (#42565)
fc9b82c 
* Add latency metrics for logstash async output

* Properly handle per-batch latency

(cherry picked from commit accc5e1)

# Conflicts:
#	libbeat/outputs/logstash/async.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 4, 2025
@mergify mergify bot requested a review from a team as a code owner February 4, 2025 06:44
@mergify
Copy link
Contributor Author

mergify bot commented Feb 4, 2025

Cherry-pick of accc5e1 has failed:

On branch mergify/bp/8.17/pr-42565
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit accc5e147.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/outputs/logstash/async.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested review from AndersonQ and removed request for a team February 4, 2025 06:44
@mergify mergify bot requested a review from rdner February 4, 2025 06:44
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 4, 2025
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Feb 5, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 5, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Feb 5, 2025

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@strawgate strawgate enabled auto-merge (squash) February 5, 2025 19:34
@AndersonQ AndersonQ removed their request for review February 6, 2025 11:26
@mergify
Copy link
Contributor Author

mergify bot commented Feb 10, 2025

This pull request has not been merged yet. Could you please review and merge it @strawgate? 🙏

@rdner
Copy link
Member

rdner commented Feb 14, 2025

@strawgate this backport is trying to use non-existent code. Conflicts need to be resolved.

@strawgate
Copy link
Contributor

strawgate commented Feb 14, 2025

I believe I'll skip backporting to 8.17 due to the refactor that occurred, does that seem reasonable?

@mergify
Copy link
Contributor Author

mergify bot commented Feb 17, 2025

This pull request has not been merged yet. Could you please review and merge it @strawgate? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Feb 24, 2025

This pull request has not been merged yet. Could you please review and merge it @strawgate? 🙏

@strawgate strawgate closed this Feb 27, 2025
auto-merge was automatically disabled February 27, 2025 01:17

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rdner rdner Awaiting requested review from rdner rdner is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@strawgate strawgate

Labels

backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@elasticmachine @rdner @strawgate @pierrehilbert